Suggest how to disable weave errors and warnings #2990
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rade
reviewed
Dec 15, 2017
common/weave/client.go
Outdated
| @@ -165,7 +169,7 @@ func (c *client) AddDNSEntry(fqdn, containerID string, ip net.IP) error { | |||
| req.Header.Add("Content-Length", strconv.Itoa(len(data.Encode()))) | |||
| resp, err := http.DefaultClient.Do(req) | |||
| if err != nil { | |||
| return err | |||
| return fmt.Errorf("%v. %v", err, noWeaveTip) | |||
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
rbruggem
force-pushed
the
no-weave-tip
branch
3 times, most recently
from
c098d56 to
7c2b54a
Compare
rade
approved these changes
Dec 15, 2017
common/weave/client.go
Outdated
| @@ -251,3 +251,7 @@ func weaveCommand(arg ...string) exec.Cmd { | |||
| cmd.SetEnv(append(os.Environ(), "DOCKER_API_VERSION="+dockerAPIVersion)) | |||
| return cmd | |||
| } | |||
|
|
|||
| func errorf(format string, a...interface{}) error { | |||
| return fmt.Errorf(format + ". If you are not running Weave Net, you may wish to suppress this warning by launching scope with the `--weave=false` option.", a...) | |||
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
This applies when running scope deployments without Weave Net.
rbruggem
force-pushed
the
no-weave-tip
branch
from
7c2b54a to
ea7853a
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This applies when running scope deployments without Weave Net.
Fixes #1726.